From 10b2c91b231c9808f2b0a27c6a476db3ce501269 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Thu, 18 Dec 2003 16:55:58 +0000 Subject: [PATCH] clear the extra_attrs list if we set "text" after "markup". (Fixes Thu Dec 18 17:52:56 2003 Kristian Rietveld * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_set_property): clear the extra_attrs list if we set "text" after "markup". (Fixes #121933, Federico Mena Quintero). --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkcellrenderertext.c | 11 +++++++++++ 6 files changed, 41 insertions(+) diff --git a/ChangeLog b/ChangeLog index f6d411f264..a480a0b600 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Dec 18 17:52:56 2003 Kristian Rietveld + + * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_set_property): + clear the extra_attrs list if we set "text" after "markup". + (Fixes #121933, Federico Mena Quintero). + 2003-12-18 Alexander Larsson * gtk/gtkicontheme.c (gtk_icon_info_get_embedded_rect): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f6d411f264..a480a0b600 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Dec 18 17:52:56 2003 Kristian Rietveld + + * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_set_property): + clear the extra_attrs list if we set "text" after "markup". + (Fixes #121933, Federico Mena Quintero). + 2003-12-18 Alexander Larsson * gtk/gtkicontheme.c (gtk_icon_info_get_embedded_rect): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f6d411f264..a480a0b600 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Dec 18 17:52:56 2003 Kristian Rietveld + + * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_set_property): + clear the extra_attrs list if we set "text" after "markup". + (Fixes #121933, Federico Mena Quintero). + 2003-12-18 Alexander Larsson * gtk/gtkicontheme.c (gtk_icon_info_get_embedded_rect): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f6d411f264..a480a0b600 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Dec 18 17:52:56 2003 Kristian Rietveld + + * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_set_property): + clear the extra_attrs list if we set "text" after "markup". + (Fixes #121933, Federico Mena Quintero). + 2003-12-18 Alexander Larsson * gtk/gtkicontheme.c (gtk_icon_info_get_embedded_rect): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f6d411f264..a480a0b600 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Dec 18 17:52:56 2003 Kristian Rietveld + + * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_set_property): + clear the extra_attrs list if we set "text" after "markup". + (Fixes #121933, Federico Mena Quintero). + 2003-12-18 Alexander Larsson * gtk/gtkicontheme.c (gtk_icon_info_get_embedded_rect): diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 9af6543c53..a4e18c284e 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -123,6 +123,7 @@ struct _GtkCellRendererTextPrivate { guint single_paragraph : 1; guint language_set : 1; + guint markup_set : 1; gulong focus_out_id; PangoLanguage *language; @@ -870,6 +871,15 @@ gtk_cell_renderer_text_set_property (GObject *object, case PROP_TEXT: if (celltext->text) g_free (celltext->text); + + if (priv->markup_set) + { + if (celltext->extra_attrs) + pango_attr_list_unref (celltext->extra_attrs); + celltext->extra_attrs = NULL; + priv->markup_set = FALSE; + } + celltext->text = g_strdup (g_value_get_string (value)); g_object_notify (object, "text"); break; @@ -912,6 +922,7 @@ gtk_cell_renderer_text_set_property (GObject *object, celltext->text = text; celltext->extra_attrs = attrs; + priv->markup_set = TRUE; } break; -- 2.30.2